broadway: Make broadway port configurable with BROADWAY_DISPLAY
authorAlexander Larsson <alexl@redhat.com>
Mon, 14 Mar 2011 14:58:55 +0000 (15:58 +0100)
committerAlexander Larsson <alexl@redhat.com>
Mon, 14 Mar 2011 14:58:55 +0000 (15:58 +0100)
gdk/broadway/gdkdisplay-broadway.c

index f0e8dc1833fb0e54d080e659b41dd21f67081c78..4651ed1dfb800516969602866cee6d08280d35dd 100644 (file)
@@ -679,6 +679,7 @@ _gdk_broadway_display_open (const gchar *display_name)
   GdkDisplay *display;
   GdkBroadwayDisplay *broadway_display;
   GError *error;
+  int port;
 
   display = g_object_new (GDK_TYPE_BROADWAY_DISPLAY, NULL);
   broadway_display = GDK_BROADWAY_DISPLAY (display);
@@ -706,9 +707,18 @@ _gdk_broadway_display_open (const gchar *display_name)
 
   _gdk_broadway_screen_setup (broadway_display->screens[0]);
 
+  if (display_name == NULL)
+    display_name = g_getenv ("BROADWAY_DISPLAY");
+
+  port = 0;
+  if (display_name != NULL)
+    port = strtol(display_name, NULL, 10);
+  if (port == 0)
+    port = 8080;
+
   broadway_display->service = g_socket_service_new ();
   if (!g_socket_listener_add_inet_port (G_SOCKET_LISTENER (broadway_display->service),
-                                       8080,
+                                       port,
                                        G_OBJECT (display),
                                        &error))
     {